Additional fixes to make packaging and compilation work out of the box, missing files will be added automatically.