Last minute optimizations, cleanups, etc.