Some compile fixes

More on the way