A few more changes for 1.3RC1