I will take a look to fix these bugs.