Fixes some issues.