Messaging fixes/tweaks. Merge s3forms fix from Pat