Fixes, works now with as 2GB Image and RPi