Small changes for compliance