Fix SW
Minor stuff