Fix some shitty performance