Fixing up more layer changes.