Some fixes ;)