Fixed system detection
Some cleanups in generic-editing