Some minor fix for the new deploy version