Tofe/work: various fixes