Fix block ids and other errors