Fixed small issues reported by zamith