Fixed specs and a few other issues