Bug fixes in repo