Merge in fixes from Khronos repository