Add more asserts
Minor fix