Workaround Numpy 1.6 datetime64 astype issue.
A little more careful.

Not sure what happens in punt condition though.
Typos
Merge pull request #1118 from chinasaur/protocol_fix

Protocol fix