Multirom fixes