more consistency fixes