bug fixes for abc layout