LP bugs fix committed + in progress