Fixed various remaining issues.