Random fixes and introducing bugs