Fixed issues from previous rearrangement.