rv mode: packaging related fixes