Fixed more errors

I had to change some more code to get project to compile (semi-colon
issues like Andrey but also enum issues).