Lab 9 Fixes