Some fixes from 'non git dev version'