diff --git a/aws-ts-pulumi-webhooks/index.ts b/aws-ts-pulumi-webhooks/index.ts
index dcf25d0da..d30256cc1 100644
--- a/aws-ts-pulumi-webhooks/index.ts
+++ b/aws-ts-pulumi-webhooks/index.ts
@@ -20,7 +20,7 @@ const stackConfig = {
 };
 
 // Just logs information from an incoming webhook request.
-function logRequest(req: awsx.apigateway.Request) {
+function logRequest(req: awsx.classic.apigateway.Request) {
     const webhookID = req.headers !== undefined ? req.headers["pulumi-webhook-id"] : "";
     const webhookKind = req.headers !== undefined ? req.headers["pulumi-webhook-kind"] : "";
     console.log(`Received webhook from Pulumi ${webhookID} [${webhookKind}]`);
@@ -28,7 +28,7 @@ function logRequest(req: awsx.apigateway.Request) {
 
 // Webhooks can optionally be configured with a shared secret, so that webhook handlers like this app can authenticate
 // message integrity. Rejects any incoming requests that don't have a valid "pulumi-webhook-signature" header.
-function authenticateRequest(req: awsx.apigateway.Request): awsx.apigateway.Response | undefined {
+function authenticateRequest(req: awsx.classic.apigateway.Request): awsx.classic.apigateway.Response | undefined {
     const webhookSig = req.headers !== undefined ? req.headers["pulumi-webhook-signature"] : "";
     if (!stackConfig.sharedSecret || !webhookSig) {
         return undefined;
@@ -50,7 +50,7 @@ function authenticateRequest(req: awsx.apigateway.Request): awsx.apigateway.Resp
 // unsecret the webhook so we can add it to the handler
 (<any>stackConfig.slackWebhook).isSecret = false;
 
-const webhookHandler = new awsx.apigateway.API("pulumi-webhook-handler", {
+const webhookHandler = new awsx.classic.apigateway.API("pulumi-webhook-handler", {
     restApiArgs: {
         binaryMediaTypes: ["application/json"],
     },
diff --git a/aws-ts-thumbnailer/index.ts b/aws-ts-thumbnailer/index.ts
index d8ca347dc..af768c02a 100644
--- a/aws-ts-thumbnailer/index.ts
+++ b/aws-ts-thumbnailer/index.ts
@@ -20,7 +20,7 @@ const repo = new awsx.ecr.Repository("repo", {
 // A task which runs a containerized FFMPEG job to extract a thumbnail image.
 const ffmpegThumbnailTask = new awsx.classic.ecs.FargateTaskDefinition("ffmpegThumbTask", {
     container: {
-        image: new awsx.ecr.Image("ffmpegThumbTask", { repositoryUrl: repo.url, path: "./docker-ffmpeg-thumb" }).imageUri,
+        image: new awsx.ecr.Image("ffmpegThumbTask", { repositoryUrl: repo.url, dockerfile: "./docker-ffmpeg-thumb/Dockerfile" }).imageUri,
         memoryReservation: 512,
     },
 });
diff --git a/misc/test/aws_test.go b/misc/test/aws_test.go
index 6ddbcf677..4fce58b5f 100644
--- a/misc/test/aws_test.go
+++ b/misc/test/aws_test.go
@@ -566,6 +566,7 @@ func TestAccAwsTsTwitterAthena(t *testing.T) {
 }
 
 func TestAccAwsTsLambdaEfs(t *testing.T) {
+	t.Skip("times out https://github.com/pulumi/examples/issues/1728")
 	test := getAWSBase(t).
 		With(integration.ProgramTestOptions{
 			Dir: path.Join(getCwd(t), "..", "..", "aws-ts-lambda-efs"),