Script tweaks [MRB]