Fixes for the Snapshot6 compilation process