diff --git a/native/serverconnection/src/audio/AudioOutput.cpp b/native/serverconnection/src/audio/AudioOutput.cpp
index 52de3a1..57d0841 100644
--- a/native/serverconnection/src/audio/AudioOutput.cpp
+++ b/native/serverconnection/src/audio/AudioOutput.cpp
@@ -212,7 +212,7 @@ ssize_t AudioOutputSource::enqueue_samples_no_interleave(const void *buffer, siz
     auto samples_to_write{samples};
     if(samples_to_write > free_samples) samples_to_write = free_samples;
     const auto enqueued{samples_to_write};
-    {
+    { //FIXME: This only works for two channels!
         auto src_buffer = (const float*) buffer;
         auto target_buffer = (float*) this->buffer.write_ptr();
 
diff --git a/native/serverconnection/src/connection/ft/FileTransferManager.cpp b/native/serverconnection/src/connection/ft/FileTransferManager.cpp
index 5c2ff18..0b9a6f3 100644
--- a/native/serverconnection/src/connection/ft/FileTransferManager.cpp
+++ b/native/serverconnection/src/connection/ft/FileTransferManager.cpp
@@ -80,8 +80,8 @@ bool Transfer::initialize(std::string &error) {
 	}
 
 #ifdef WIN32
-    u_long enabled = 0;
-    auto non_block_rs = ioctlsocket(this->_socket, (long) FIONBIO, &enabled);
+    u_long enabled = 1;
+    auto non_block_rs = ioctlsocket(this->_socket, FIONBIO, &enabled);
     if (non_block_rs != NO_ERROR) {
         this->finalize(true, true);
         error = "failed to enable non blocking more";
@@ -100,6 +100,7 @@ bool Transfer::initialize(std::string &error) {
 
 bool Transfer::connect() {
 	int result = ::connect(this->_socket, reinterpret_cast<sockaddr *> (&this->remote_address), sizeof(this->remote_address));
+
 	if (result < 0) {
 #ifdef WIN32
         auto error = WSAGetLastError();