Merge cleanups
Fix optional component handling