Some fixes
quick merge