Update .config and Fixes