fixing warnings and save bang calls are not needed there