Bug fixes with smartmove behavior.