Fixes for ppdp2014 code