Fixes for sge/mizuiro