Fixing compile-time errors
Pre-submission commit