Small misc and assert related stuff