Sorbet: Fixes for Virtual Filesystem
MOAR fixes for package build integration