Jessie fix

Updates to fix Jessie compile / install issues