Various issues addressed for rc1