Just a couple more quick fixes before the drastic restructure happens.

Signed-off-by: Ken Hoover <ken.hoover@mail.utoronto.ca>