fw fixes