Small bugfixes [ci skip]