Bugfixes post-jam