Changes leftover from porting stuff from Bitcoin