SALTR related fixes and cleanup.