Some small enhencements.