Power-up Adjustments/Fixes