Minor modifications here and there