Version 0.2.2 fixes