Attempts to fix stuff..