Version 2.0 fixes