Issues fixes and external tools integration