Partial commit of bugfixes, etc.