Fixes and whatnot