More fixing per comments