Fixes on meele and stuff