Mjoeyri setup related changes
A slew of small tweaks