Nalanda hotfixes back into RCT2