Some tweaks and fixes for her