Fixed some papercuts.