Fix case statements, and hopefully node for VM