CI & Dependencies fixes