More fixes and stabs in the dark.