Fit some bugs