Prevents error when moving columns
Performance fixes.