Fixes for the x@ pattern bit