Fixes for Make Image and Boot Script

Fixes for make image and boot script