Fixing breakages.

Might be using Typescript at some point.