Some fixes for nudge