More updates to RTOS based code