Fixing a couple delegate parsing issues