Fix master build errors post merge with master_gl branch.
2 files changed