Quickfixes for legacy scripts