Minor fixes for getting epic to work