Fixes, things, and stuff