Fixed coding problems