Config updates

@jdan please review this.