Minor code modifications.