Fixing small changes