Fixed some screen loader bugs