Fixing small bugs here and there.