Minor updates to meet pub Guidelines