More Fix #29 cleanup