Bug fix and power save