Compilation fixes.
Merge branch 'master' of github.com:kucik/thalie-scripts