Fix some minor issues

As promised.