Moved over latest changes from other projects