Fixes stuff from last couple commits.