Some more tewaks to the power section