Home Fix System Issues

Fix System Issues