More shog-fixes