Changed an old class name in the array for Zeus compatibility, other cleanup