fixes according to erwanite