Minor special functions cleanup