Trying to fix trophy crash
Fix possible crash
Fix golden egg crash
Fix few golden eye problems
Align to lib