Vass's fixes