Round 2 on fixing things