Fix specs, add stdlib