Fix half baked commits