Small minor fixes

... before the big changes