Some Simple Fixes