Tweaks for bugfixing