Small changes to comply with standards