Fixing some inconsistencies