Fixes for remote server issues