final pre-Faire updates