Fixes done on Pi