Fixed bug with OBP determination and added support for LSI patches