Fixes (need to test first before committing ;) ).