more epic fixes