diff --git a/veejay-current/veejay-core/libvjnet/cmd.c b/veejay-current/veejay-core/libvjnet/cmd.c
index 2a14f5d0..8c1fcd1b 100644
--- a/veejay-current/veejay-core/libvjnet/cmd.c
+++ b/veejay-current/veejay-core/libvjnet/cmd.c
@@ -82,8 +82,8 @@ static int sock_connect(const char *name, int port) {
 vj_sock_t	*alloc_sock_t(void)
 {
 	vj_sock_t *s = (vj_sock_t*) malloc(sizeof(vj_sock_t));
-	memset( s, 0, sizeof(vj_sock_t));
 	if(!s) return NULL;
+	memset( s, 0, sizeof(vj_sock_t));
 	return s;
 }
 
diff --git a/veejay-current/veejay-server/libel/elcache.c b/veejay-current/veejay-server/libel/elcache.c
index 5bfe66e5..11006205 100644
--- a/veejay-current/veejay-server/libel/elcache.c
+++ b/veejay-current/veejay-server/libel/elcache.c
@@ -105,7 +105,7 @@ static	int	cache_locate_slot( cache_t *v, long frame_num)
 
 void	*init_cache( unsigned int n_slots )
 {
-	if(n_slots <= 0)
+	if(n_slots == 0)
 		return NULL;
 	cache_t *v = (cache_t*) vj_calloc(sizeof(cache_t));
 	v->len = n_slots;
diff --git a/veejay-current/veejay-server/libstream/vj-dv1394.c b/veejay-current/veejay-server/libstream/vj-dv1394.c
index 265bda8a..35b81213 100644
--- a/veejay-current/veejay-server/libstream/vj-dv1394.c
+++ b/veejay-current/veejay-server/libstream/vj-dv1394.c
@@ -86,7 +86,10 @@ vj_dv1394      *vj_dv1394_init(void *e, int channel, int quality)
 	}
 
 	vj_dv1394 *v = (vj_dv1394*)vj_malloc(sizeof(vj_dv1394));
-
+	if(!v) {
+		return NULL;
+	}
+}
 	v->map_size = (el->video_norm == 'p' ? DV_PAL_SIZE: DV_NTSC_SIZE);
 	v->handle = -1;
 	v->width = el->video_width;
diff --git a/veejay-current/veejay-server/veejay/vj-osc.c b/veejay-current/veejay-server/veejay/vj-osc.c
index ebd5fefa..4170b3a5 100644
--- a/veejay-current/veejay-server/veejay/vj-osc.c
+++ b/veejay-current/veejay-server/veejay/vj-osc.c
@@ -316,9 +316,9 @@ static	void	osc_add_client(void *context, int arglen, const void *vargs, OSCTime
 		return;
 	}
 	char port[6];
-	snprintf( port, sizeof(port-1), "%d", args[0] );
+	snprintf( port, sizeof(port), "%d", args[0] );
 	char name[1024];
-	snprintf(name, sizeof(name)-1, "%s:%s", str,port );
+	snprintf(name, sizeof(name), "%s:%s", str,port );
 	char *cmd = "/status";
 	char *nptr = name;
 	if( osc_has_connection( name ) ) {