Ammends some leftover mistakes.