Minor changes/additions