Bug adjustments