[#841] -O3 fixes, continued