Http engine fixes