initial cut at fixes for NEON-1112, NEON-1113.  not elegant, but may be ok for the demo