LeeSalisbury2012b & APGuayPaquet13 fixes