Cleaned up differences between systems