Changes for update to JADE source