Fixed papercuts.
Fixed more papercuts.