Add remaining validations, fix broken specs