Attempting to fix some issues.