Various tweaks/fixes after usage in the wild