Minor fixes for final submission