Various bugfixes from displayManager swap