Random fixes and whatnot