Couple tweaks here and there to help with non-standard usage
Tweaking things