Made some things work a bit better.