Bug fixes for adaptation to 802.11n