diff --git a/AirConnect-1.8.1.zip b/AirConnect-1.8.3.zip
similarity index 83%
rename from AirConnect-1.8.1.zip
rename to AirConnect-1.8.3.zip
index 9bb7de1..39e0e27 100644
Binary files a/AirConnect-1.8.1.zip and b/AirConnect-1.8.3.zip differ
diff --git a/CHANGELOG b/CHANGELOG
index a0ffec8..62ecbbd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-1.8.3 (NR)
+1.8.3 
  - (aircast) stream type is LIVE and duration is not part of metadata
  
 1.8.2
diff --git a/aircast/src/aircast.h b/aircast/src/aircast.h
index 27c9d52..7cfe848 100644
--- a/aircast/src/aircast.h
+++ b/aircast/src/aircast.h
@@ -18,7 +18,7 @@
 #include "raop_server.h"
 #include "cast_util.h"
 
-#define VERSION "v1.8.3NR"" ("__DATE__" @ "__TIME__")"
+#define VERSION "v1.8.3"" ("__DATE__" @ "__TIME__")"
 
 /*----------------------------------------------------------------------------*/
 /* typedefs */
diff --git a/aircast/src/cast_util.c b/aircast/src/cast_util.c
index 7436387..2f60cce 100644
--- a/aircast/src/cast_util.c
+++ b/aircast/src/cast_util.c
@@ -111,10 +111,10 @@ bool CastLoad(struct sCastCtx *Ctx, char *URI, char *ContentType, const char *Na
 		return false;
 	}
 
-	msg = json_pack("{ss,ss,ss}", "contentId", URI, "streamType", !MetaData->duration ? "LIVE" : "BUFFERED", 
+	msg = json_pack("{ss,ss,ss}", "contentId", URI, "streamType", (MetaData && !MetaData->duration) ? "LIVE" : "BUFFERED", 
 						          "contentType", ContentType);
 
-	if (MetaData->duration) {
+	if (MetaData && MetaData->duration) {
 		json_t* duration = json_pack("{sf}", "duration", (double)MetaData->duration / 1000);
 		json_object_update(msg, duration);
 		json_decref(duration);
diff --git a/airupnp/src/airupnp.h b/airupnp/src/airupnp.h
index 546e690..be984c7 100644
--- a/airupnp/src/airupnp.h
+++ b/airupnp/src/airupnp.h
@@ -21,7 +21,7 @@
 #include "cross_util.h"
 #include "metadata.h"
 
-#define VERSION "v1.8.3NR"" ("__DATE__" @ "__TIME__")"
+#define VERSION "v1.8.3"" ("__DATE__" @ "__TIME__")"
 
 /*----------------------------------------------------------------------------*/
 /* typedefs */
diff --git a/common/libcodecs b/common/libcodecs
index 7b8b383..fb2cf6b 160000
--- a/common/libcodecs
+++ b/common/libcodecs
@@ -1 +1 @@
-Subproject commit 7b8b383d8841a3bd0aeca32cfca9baa01bad84c4
+Subproject commit fb2cf6b096cce2e630f0c05174ab3aa9bd3503c1
diff --git a/common/libraop b/common/libraop
index b78cb68..09c6499 160000
--- a/common/libraop
+++ b/common/libraop
@@ -1 +1 @@
-Subproject commit b78cb68ffb135395cc7029066fb8bcdb7dbb8626
+Subproject commit 09c64996fa863f5f327ea441030fe20e48092121