Fixing some issues reported from -Wall flag