Fixes to defconig