RL2 compatibility fixes for latest version (2.0.0b5)