Fix misc stuff.