Fix #7 crash and graphical issues on 2.2 and 2.3