Even more SW fixes