Code corrections