Hotfix

Some hotfix I done on the current master branch.