Bugfixes and backwards compatibility