More testing to fix crashes