Push some fixes.
Allow disabling libnotify.