Fixing two small bugs.