fix configs based on code review