Display and load bugfixes