First commit - Minor changes