Bugfixes, started policy work, etc