cleanup, fix system spec
Fix failing 1.8 specs