Minor tweaks to conform to the requirements