A few more small issues