Tweaks after testing