Major overall (fix #1, fix #2 and fix #3).