Made scripts a bit more compatible