Remove a few minor compilation errors
Remove a few minor compilation errors. Add correct declarations etc
Remove compilation errors