Fixed some issues w/ previous commits.

Signed-off-by: William 'cathode' Shelley <cathode@live.com>