various fixes for 1.2