Should I do more fixes??