More fucking tweaks