diff --git a/src/driver/record.h b/src/driver/record.h
index a973d972c..c9ccf7716 100644
--- a/src/driver/record.h
+++ b/src/driver/record.h
@@ -71,7 +71,7 @@ class CRecordInstance
 {
 	private:
 		typedef struct {
-			unsigned short apid;
+			uint32_t apid;
 			unsigned int index;//FIXME not used ?
 			bool ac3;
 		} APIDDesc;
diff --git a/src/system/lastchannel.h b/src/system/lastchannel.h
index 911e7bd5e..0c281b1c5 100644
--- a/src/system/lastchannel.h
+++ b/src/system/lastchannel.h
@@ -34,7 +34,7 @@ class CLastChannel
 		{
 			int             channel;
 			t_channel_id channel_id;
-			unsigned long   timestamp;
+			long int   timestamp;
 			int channel_mode;
 		};