Errors from last commit corrected