Fix issues with marketplace build