some small adaptions