Minor fixes
First working version