Bugfixes, improvements, etc.