Some bugfixes commited