Bugfixes from client tickets