Add echo statements and fix master branch build type handling