Changes for debugging scripts