Feature/ep001 minor fixes