Small fixes oc

Could this prevent device from booting?