Fix issues reported by FireFart