Fixed deployment issues of Fabuloso migrated from Fabric