Various fixes for 1.2