Fixed more build errors, changing field getter/setters to use Delegate pointer too.