Fixed build errors that were in last commit