Fixes to integrate better with MirageWeb Backend