Additional fixes to bin&jar conundrum