Minor fixes, SD still not work