Make spec and lib match better