Small fixes

Some small fixes before the obstacle gen update