Few changes to play from testing

Small things