Source compatibility fixes.