Few minor changes

Some changes I did a while ago, needed to check-in to move development
elsewhere.