misc stupid fixes. NBD