Removing build warnings