misc small adaptions