Fixing small bugs.