Misc. changes for appearance (2)