Pattern updates and style fixes