Fixed up definitions, now only couple of cases to fix