Some bugfixing after user feedbak