Saging sinks threads, bug fixes