SSN and Bug fixes