A few more small issues fixed