Bug fixes after markups