Move inv-related actions to PIL & unbreak