Some improvements related to fixtures

This is just to allow for reviewing, please don't press the Merge button. I'd prefer to push it myself when I consider it really done. :-)