Some fixes
Merged latest changes from master