More id fixes (#6)