Automerger fixes

* sn validation
* better components saving
* some picle error ;)