Some minor fixes

As suggested by Tofe