Minor updates

A few minor updates...