Tiny fixes for ep.