Fixed the remaining bits.