- pedantic fixes