More fucking fixes