Add some conditionals for non-flash and nme