bugfixes from Finncon