Further lint fixes