Jreidinger fixes

Please do not merge yourself, as we want to have at first built DVD in YHr