Fix up Shatter port for 1.7. Ready for release.