Minor updates from dev workstation.