Resolve issues according to Gedare's comments before submitting or1ksim BSP patch