Fixed a couple of mistakes and inconsistencies