Some warning fixes for "no previous declaration"