some experimental fixes