Merged Ghostrider fixes

Merged Ghostrider fixes