Spotweb fixes. Work in progress. Use with caution.