diff --git a/src/main.c b/src/main.c
index bfac17c..3d48184 100644
--- a/src/main.c
+++ b/src/main.c
@@ -59,7 +59,7 @@ int main(int argc, char **argv) {
   /* Init everything */
   atexit(deinit);
   soundblaster_init(mixer_getNextBlock);
-  //vga_init();
+  vga_init();
   palette_init();
   keyboard_init();
   mouse_init();
diff --git a/src/mixer.c b/src/mixer.c
index d60e0ef..01f3637 100644
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -75,7 +75,7 @@ void mixer_mix(void) {
 
   for(int i = 0; i < activeSources; ++i) {
     mixed_sound_t *snd = sources + i;
-    int len = snd->source->sampleCount;
+    int len = snd->source->sampleCount - snd->offset;
     int16_t const* sourceBuf = snd->source->samples + snd->offset;
 
     if(len > SOUNDBLASTER_SAMPLES_PER_BUFFER) {