Make more cases work