Fix some more bugs with new version