Epoch and menu fixes