Clarify requirements, fix for smoke tests