Fixing sampleApps