Fix/various 20140731

Wanted for downstream Datastax work.