Remote capability and shllow fixes