Deploy bugs solved