Tweaks for easier usability