Just Dodge, LOL: Small fixes

Bugfixes