Fixups for dev branch

I was looking at the dev branch which we want to build our development on and came up with possible fixes.

It might be good to say something about our planned dev model as well.