S3 - Fixes on specs