Cra 505: Small fixes