compile fixes
Merge branch '1.12'