Fixed issues raised on training day 1