Attempt to fix some stuff with case