in-progress fixes for displacement issues