Small fixes 3

A couple of small fixes.