Some fixes, I do not remember what are they for...
Merge branch 'master' of github.com:passika/auto