Bug fixes for rippled compliance