More review changes from jibran