Clean up. Add %lib32 support