Fixed soem errors with a previous commit deleting some stuff.
Merge branch 'fix'