epoch building fixes TBA