Arc lint fixes