some consistency fixes