Some minor changes from before power cut