Fix for the remaining Scorpion issues

For now it's to my liking.

Signed-off-by: GreatEmerald <pastas4@gmail.com>