Some assert cleanup