Minor updates after importing from darcs repo