Modifications for old compiler