Organisation standard

Various fixes at the end of the day