Add some missing quote for variables