Fix some issues.
Oops, wanted to keep that.