Some small changes Makeyear etc