Fix minor details