Trivial fixes 2

Some extra fixes.