Misc updates
possible fix for D.O. site