Minor Logic Fixes