Try to fix some oddities