Some consistency fixes