Fixed/added asserts