A few more small cleanups + open source license