Bug fixes for a512b18