Fix mess-ups