Sort out custom vars