The last merge fucked up the Connection class. Fixed it.