Fix formatting, update to build on several versions.