attr fixes; prepping crypto headers