Some fixes
Merge branch 'Juls_Branch'