More bug fix fiddling