Some tweaks, that I now don't remember what they are