more experimental engine fixes