A few bugs I did not catch before