Fix class names
Throttle more in line with master
Explain System.err call
Fix issues with template management under cassandra