Fixed multiple issues from mantis