Minor changes all around