Some fixes and whatnot.