Bonking is cheaper
Fix more things