Sync with local tree - fix warnings/isset