Double checkings some minor details