Fix formatting and enumerator problems