Shitty fixes