Better quickfix handling