Fixes

Created by: bolmsten

This PR contains small fixes for things we noticed while other people was running a real experiment.

See commits for more information