Adding fixes for guest script customisation