better apply fixes