Fix problems with interface moving