Cra 505: Bugfixes