Fix interfaces in order