Added fix snippets