Fixed another compile error
Merge branch 'lockframe' into jb-mr1