naive changes to make it compile