Fixes some of the issues.