More chosen fixes for sake of looking professional