Make idempotent and update to standard Java install paths