Fix some poorly ignored things