A few bugfixes (?) check them.