Fix interfaces