Several bugs in v1.9