Removed/fixed some annoying asserts