Fixing Block enum issues