Minor changes to fix issues.