Tweaks from Linus Nordberg