Fixed coding errors