Fixed several *more* issues.