Get in some more bug fixes