Turn based fixes for DM UI