Cleanups
Summit 0.13 compatibility