Fixed formatting issues with control and xbuild command.