Various fixes, for release 2.020713rc
2.021113rc