consistency fixes