Some fixes ^^