Some fixes to schema parsing on client side.