Fixed the buffer issue in WiN for Android, notifications next!