Some corrections to please travis + some specs