Some quick updates to make things, ya know, work correctly.