Some small tweaks i forgot in previous commit