Config changes, bug fixes