Visual adjustments and 0.4.2 compat