Small fixes - salesforce plugins seem to work now