various fixes for consistency