Disable QNAP for now
Fixes for new build system
Fixes for new build system
Don't call sudo under sb2