some fixes for connecting to nakamura