Fixing small issues