Fixed bugs while testing on RWC servers