Small fixes for proper power tracks