Text changes and build fixes