Update for non-debug 5730 build or Pi