MInor updates

See the commits for details, nuthin special.