Fix the missed bits