changes to make the thing compile properly in release scheme