Build file changes and some moving around of properties