fixes according to issue comment