Add fixes (suggested by Denis)