Fixes for mizuiro