Minor changes for visibility