two bugfixes for roco