Bug fixes following markups