Fixes

Some fixes ;)