Investigating #24
-Also backported a few fixes from experimental