Small bug fixes and improvements

Hello Hunters and Props!

A patch to bring some late optimizations and fixes for various errors and crashes.

Have fun!