More Script-Fixes