diff --git a/input/joystick.c b/input/joystick.c
index 6be749e21d..f48f3aab25 100644
--- a/input/joystick.c
+++ b/input/joystick.c
@@ -46,7 +46,7 @@ int mp_input_joystick_init(char* dev) {
   while(! inited) {
     l = 0;
     while((unsigned int)l < sizeof(struct js_event)) {
-      int r = read(fd,&ev+l,sizeof(struct js_event)-l);
+      int r = read(fd,((char*)&ev)+l,sizeof(struct js_event)-l);
       if(r < 0) {
 	if(errno == EINTR)
 	  continue;
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index 59d467c22e..f6f9abe035 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -534,10 +534,11 @@ int demux_ogg_open(demuxer_t* demuxer) {
 //	  if(sh_a->wf) print_wave_header(sh_a->wf);
 	}
 	/// Is it the stream we want
-	if(demuxer->audio->id == ogg_d->num_sub)
+	if(demuxer->audio->id == ogg_d->num_sub) {
 	  demuxer->audio->sh = sh_a;
 	  sh_a->ds = demuxer->audio;
 	  ds = demuxer->audio;
+	}
       }
       if(sh_v) {
 	/// Also for video
@@ -545,10 +546,11 @@ int demux_ogg_open(demuxer_t* demuxer) {
 	  demuxer->video->id = ogg_d->num_sub;
 //	  if(sh_v->bih) print_video_header(sh_v->bih);
 	}
-	if(demuxer->video->id == ogg_d->num_sub)
+	if(demuxer->video->id == ogg_d->num_sub) {
 	  demuxer->video->sh = sh_v;
 	  sh_v->ds = demuxer->video;
 	  ds = demuxer->video;
+	}
       }
       /// Add the header packets if the stream isn't seekable
       if(ds && (!s->end_pos || index_mode != 2)) {