Update for 0.90

Not sure this is perfect across the board but hopefully useful if others are running into similar issues.