Changes to work on rPI