Simple Fixes and Checks