Hopefully final tweaks