further ogish fixes