Some unnecessary fixes