Fixed ip being locked
Various fixes