Small bugfixes
Fixed merge conflicts