Ohshi fixes (hopefully)