Fixing some assert macros