Fix develop issues after live testing