fixed schema conforming issues