Just a few bugfixes