Bugfixes

Various bugfixes spotted today :smile: