Fixing errors that appears after updating with latest master code