Various weird desperate changes done to fix something that most probably failed due to out of date generated files...