Various fixes.
Updating this.