Improvements for HWBP support