Spec and fixes