Fixes for wireless handling in proto handler.