more mssid fixes