More fixes
First working copy