Adjusted minor things