Fixes things from last couple of commits.