General Commit: Minor changes