Fixes after initial German version