Fixes according to comments from Domenic.