Fixes for Walking Notification