Minor alterations to comply to standards