more rc 0.6.0 II code review fixes