Fix some of the issues that Jelmer identified in my first patch. This might be