Fixes for german