Orthononalize bug fixes