Attempting to fix some weird issues.