Some bug fixes and enhancements for the ng snipppets.