Fix the interfaces once and for all