Handling fixes for remote