diff --git a/src/emu/cpu/nec/necpriv.h b/src/emu/cpu/nec/necpriv.h
index 7e2ab31a9e4..5913acb94e0 100644
--- a/src/emu/cpu/nec/necpriv.h
+++ b/src/emu/cpu/nec/necpriv.h
@@ -171,9 +171,9 @@ typedef enum {
 #define CLKR(v20o,v30o,v33o,v20e,v30e,v33e,vall,addr) { const UINT32 ocount=(v20o<<16)|(v30o<<8)|v33o, ecount=(v20e<<16)|(v30e<<8)|v33e; if (ModRM >=0xc0) nec_state->icount-=vall; else nec_state->icount-=(addr&1)?((ocount>>nec_state->chip_type)&0x7f):((ecount>>nec_state->chip_type)&0x7f); }
 
 /************************************************************************/
-#define CompressFlags() (WORD)(CF | 0x02 | (PF << 2) | (AF << 4) | (ZF << 6) \
-				| (SF << 7) | (nec_state->TF << 8) | (nec_state->IF << 9) \
-				| (nec_state->DF << 10) | (OF << 11) | (nec_state->MF << 15))
+#define CompressFlags() (WORD)(int(CF) | 0x02 | (int(PF) << 2) | (int(AF) << 4) | (int(ZF) << 6) \
+				| (int(SF) << 7) | (nec_state->TF << 8) | (nec_state->IF << 9) \
+				| (nec_state->DF << 10) | (int(OF) << 11) | (nec_state->MF << 15))
 
 #define ExpandFlags(f) \
 { \
diff --git a/src/emu/sound/disc_inp.c b/src/emu/sound/disc_inp.c
index d7b91d09b87..0e3bd419f43 100644
--- a/src/emu/sound/disc_inp.c
+++ b/src/emu/sound/disc_inp.c
@@ -242,7 +242,7 @@ DISCRETE_START(dss_input_stream)
 {
 	DISCRETE_DECLARE_CONTEXT(dss_input)
 
-	assert(DSS_INPUT_STREAM__STREAM < node->device->m_input_list.count());
+//	assert(DSS_INPUT_STREAM__STREAM < node->device->m_input_list.count());
 
 	context->is_stream = TRUE;
 	/* Stream out number is set during start */
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index 5fe4e7a8829..f7a696b7c70 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -182,7 +182,7 @@ class _name ## _node: public discrete_legacy_node		\
 {														\
 public:													\
 	_name ## _node (discrete_device * pdev, const discrete_module *xmodule, const discrete_sound_block *block) \
-	 : discrete_legacy_node::discrete_legacy_node(pdev, xmodule, block) {  } \
+	 : discrete_legacy_node(pdev, xmodule, block) {  } \
 														\
 }
 
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index ea0477c0d3b..7b4bf1b1a48 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -4900,7 +4900,7 @@ class discrete_legacy_node : public discrete_base_node
 public:
 
 	discrete_legacy_node(discrete_device * pdev, const discrete_module *xmodule, const discrete_sound_block *block)
-	 : discrete_base_node::discrete_base_node(pdev, xmodule, block), m_step(module->step) {  }
+	 : discrete_base_node(pdev, xmodule, block), m_step(module->step) {  }
 
 	void step(void)  { /* if (m_step != NULL) */ m_step(this); }
 	virtual void reset(void) { if (module->reset != NULL) module->reset(this); }