Small code modifications.