Fixed smaller issues