Bugfixes with Davy