Fixing problems after latest merge