bug fixes for working remotely