minor changes as per PR