Minor changes for convenience