Fix some stack issues, more to do