Squashed one bug and fixed a type.