Clean up. Add %lib3 support