Fix to allow web to run. Unit tests need reviewed.