Other Fixes, cosmetic things