Fix specs and update base