Bug fixes, random stuff.