Fixed compiler errors from last commit