Fixing little issues