Lab 9 Fixes

Fixes for Lab 9