Small imrpovements