Additional Simple Fixes