Killed several build warnings