Some more project redistribution fixes