Commit issue fixes