Misc changes. Lame.