Few fixes for manifest details