Various fixes for live branch