Quick fixes in loading