Merge: Less null warnings in src/