Hopefully fixed assorted issues.