Fix system breaking bug(s).