Release v.1 fixes