Few small changes requested by Mere