Bug fixing for here and there