Fixing some personal headaches

No changes to any code. Just some small fixes.