Fixes from the second author

Signed-off-by: Flammie Pirinen <flammie@iki.fi>