Live changes and fixes