Fix issues with back port

I copied some of the wrong files into this branch, this fixes them.