better support for adhoc build commands