Some bug fixes, and notificationCompat