Second pass of fixes after some use.