more format fixes, this is breaking BC