Some fixes to 20140505
Start 20140505