Merge cleanups
Fix VERSION variable name, cleanup 'not found' handling