Update cases and small fixes