Minor updates for 1.2