Fix CoreServices main
Fix settings/configurations