Fixed some issues reported