Minor Fixes

Some minor fixes to Stage 10