Some customizations due to jar packaging