Pull req: Sprint 40 alex small changes