Remove compiler warnings (please check before committing!)