Some fixes, improvments and merge from main repository