Fixed some inconsistencies