fix remaining issues with optional coupling 

refs #2358