Fix System Issues