Fixes

These fixes was 3 hours ago but my power went off, preventing me to commit them and push to github.