Changes to get boot working