Less build warnings