Several fixes reported by jim F.
1 file changed