Fixes to previous issues.