#238 Another series of fixes