Final changes related to the orientation changes.