Minor changes, will merge from upstream