Fix potential issues