more fixes toward rice2