Few fixes from manual testing