Fixed issues reported by client