Misc fixes/beautification.