More left out changes to merge with other working copy.