Fixes for khadath.