Minor improvements to remove alerts in Intelli/J