Minor updates to match master