Some tweaks and fixes