Fixes for changes to Platform and Foundation
busted