Core: Bugfixes from reports