Aaaaand fixes