minor fixes while rotating screen