Small fixes and compatibility

Compatibility with CU2 Patch 1 Beta.