Pulled more compile fixes through