Converted some asserts