Fix two more segfaults reported by zlul