Compile fixes and other 3