Final LP fixes