fix object singleton, fix handshake stricht warnings