Better power up handling