fixed assert
more macro fixes