Fixes according to emailed feedback from Petri