Bug/manual testing fixes