Reduce possibility for warnings, notices (thanks GonzaloTGEB)