Build changes (NMEless flash build)