2 bugfixes for the last commits