Addressing a few more issues.