Trying to sort out some inconsistencies