Fixes from manual testing