Added fixes for dev but keep extension clean for node build