Bug fixes for 2.1 release (1-22-14, 2)