Merge fixes for reported issues on January 22 2014

Merge fixes for reported issues on January 22 2014