Reducing build errors/warnings