Improves some specs