Abstraction fixes.