Fixing a derp with Optional stuff...