Bug fixes for HMS211.1 handling