further gcc warning fixes