Little bugfixes