Remove unneeded require_once and fix ts()
More fixes for 4.5