fixed.

Looking into these errors. Some have been fixed already from other commits, but it looks like there's still at least 2-3 remaining.