Various small fixes for 1.2 release