Shared Checks/Fixes ...