More fixes...
Another ten bajillion fixes