Add salt fixes.
Other fixes from moving from app to website.