Small consistency fixes