diff --git a/sound/source.hpp b/sound/source.hpp
index 1eb42a283..8d2a801bc 100644
--- a/sound/source.hpp
+++ b/sound/source.hpp
@@ -28,8 +28,8 @@ class SampleSource : public Stream::Stream
   // Disabled functions by default. You can still override them in
   // subclasses.
   void seek(size_t pos) { assert(0); }
-  size_t tell() const { assert(0); }
-  size_t size() const { assert(0); }
+  size_t tell() const { assert(0); return 0; }
+  size_t size() const { assert(0); return 0; }
 };
 
 typedef boost::shared_ptr<SampleSource> SampleSourcePtr;
diff --git a/stream/clients/audiere_file.hpp b/stream/clients/audiere_file.hpp
index 691525ad9..61e26f21b 100644
--- a/stream/clients/audiere_file.hpp
+++ b/stream/clients/audiere_file.hpp
@@ -23,14 +23,14 @@ class AudiereFile : public audiere::RefImplementation<audiere::File>
     : inp(_inp) {}
 
   /// Read 'count' bytes, return bytes successfully read
-  int read(void *buf, int count)
+  int ADR_CALL read(void *buf, int count)
     { return inp->read(buf,count); }
 
   /// Seek, relative to specified seek mode. Returns true if successful.
-  bool seek(int pos, audiere::File::SeekMode mode);
+  bool ADR_CALL seek(int pos, audiere::File::SeekMode mode);
 
   /// Get current position
-  int tell()
+  int ADR_CALL tell()
     { assert(inp->hasPosition); return inp->tell(); }
 };