Fixes for final submission