fix quickfix on last Assert usage and static import