Further adjustements for new rc1