Final small changes