Some fixes for the snodge.