Fixed some issues with loading