Minor improvements

While reading it I found some small things to fix :)