Minor Code Tweaks

No major fixes.