Properly apply extensions. Fix some JSON instantiations.